Fix travis builds

diff --git a/.travis.install.deps.sh b/.travis.install.deps.sh
index ff4f5007e3139520f57cc4715c30e3a5a336320f..4f3627f3a62c0cfe13cafd43b430ad495bc99eb7 100755 (executable)
--- a/.travis.install.deps.sh
+++ b/.travis.install.deps.sh
@@ -12,7 +12,7 @@ fi
 if [ "${TRAVIS}" = "true" ] && [ "${target}" = "unknown-linux-gnu" ]; then
     # Install a 32-bit compiler for linux
     sudo apt-get update
-    sudo apt-get install gcc-multilib lib32stdc++6
+    sudo apt-get install g++-multilib lib32stdc++6
 fi
 
 # Install both 64 and 32 bit libraries. Apparently travis barfs if you try to

diff --git a/.travis.yml b/.travis.yml
index 4141358efd03cc2a9b19b1531e6cc8229811e438..2737490790bd0b058844001042e81f143a04d913 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,8 @@ script:
   - make install DESTDIR=${PWD}/destdir
 
 env:
-  global:
-    - LD_LIBRARY_PATH=/usr/local/lib
-    - DYLD_LIBRARY_PATH=/usr/local/lib
-  matrix:
-    - BITS=32
-    - BITS=64
+  - BITS=32
+  - BITS=64
 
 os:
   - linux